Added Colour type to cleanup logic, cleanned up some of the logic in combatant and moveable, looking to start the velocity work