Implementing World step (update + draw) plus preliminary work for attacks.
Merged