WIP: Tidying up Ally and Enemy Code