Added in other game modes, started merging changes