Almost There

Lots of changes to lots of things. Getting close to finishing the
redesign.