Issue #24: Towards a lighter codebase
Merge branch 'major_refactor' of github.com:redjack/FTE into major_refactor