refactor
cleaned up somewhat
Merge branch 'feature/clean-up-core' into develop
Merge branch 'master' into feature/compile-folder
can now compile a folder
Merge branch 'feature/compile-folder' into develop