Played with combat to make things smoother.
Ingame is still dodgy after combat occurs though
Got the test for combat updated