Complete code re-write and fixed some things
Merge branch 'master' of https://github.com/savageboy74/ProjectArcane