Major refactoring, added support for future functionality
Merge branch 'master' of https://github.com/kxc1013/Graphist