Merge refactor with game play logic