May finally have almost fixed this asshole of a bug
Merge branch 'master' of https://github.com/Frogging101/ZorvWarz