skeleton of refactor
Complete refactor
Merge pull request #1 from nullmoose/refact

Refact