A bunch of work to make ready for the new design.

I needed to get this out sooner than I was ready so I can work on another task so I just put the old homage back as it was.