Began refactoring with partials
Merge pull request #9 from neich8/partials

Began refactoring with partials