Major refactor
Views are starting to work again
Working though more cleanup
Whitespace
Add tests