implemented gamehandler
fixed merge conflicts