Moved around some code
Merged som files
Merge branch 'master' of https://github.com/kerp1/tripleam