New take on the whole idea, starting with the layout. Committing a few dirty bits, cleaning up following.