Refactor to new class.
Merge branch 'master' into test

Conflicts:
	zrunner.html
Pass game tests.
Merged from master.