Updates lobby and mechanics logic.
Merge pull request #127 from JonathanWarrick/cleanup

Continue to not break.