starting refactor... step one of making this not suck
Merge branch 'master' of https://github.com/dev-isaac/Sandbox