complete refactor
overhaul
Merge pull request #1 from meli-lewis/master

refactor