Massive refactoring
Merge branch 'master' of github.com:zencephalon/alphabet