Implementing real design; Major cleanup/refactor