worked on design issues, refactoring, moving to partials