Feat/redesign

-This is is somewhat reasonable shape for demoing tomorrow
-Still lots of room for improvement though. If you pull down the code and run it, I'm happy to add changes in any time we have before the presentation tomorrow.