Refactored marker functionality out of game, added specs