Revert "Complete Rewrite"
Merge pull request #88 from ArcBees/revert-86-rewrite

Revert "Complete Rewrite"