Messed up the layout. Committing so I can backtrack.
Nearing the end of a big overhaul.