Complete refactor
Merge pull request #1 from caseymct/new-entries

Complete refactor