refactored game flow to baseline project