initial refactor
Merge pull request #1 from shanejonas/feature/refactor

initial refactor