Cleanup/Enforce Game object on Event

Signed-off-by: Chris Sanders <zidane@outlook.com>
Merge remote-tracking branch 'upstream/master'
Added Game