WIP NO LONGER WIP.

Decided I liked it looking like a mass of spaghetti so I kept the structure lines.

PROBLEM, CLEANUP LESSONS?