Updated designs
Initial code check in

* All states complete
* In game logic complete