Trying to shuffle things a bit
A lot of bug fixes and improvements to Police force and Ambulance