Getting ready for Multiplayer

* Bug fixed
* New functionality
* Prep work for Multiplayer