pretty sweeping changes, preparing for more of a "game"