Beginning refactor to two player