Initial commit
Merge from alpha
Support for all game modes