Added several issues worth of code for Game Infrastructure