finished funcitonal refactor of existing demo game