Working view!

Clean up, more rational organization, working views!