ugh
Merge pull request #3 from every2ndcountsxc/refactor-3

ugh