Level progression working, but kind of hack-ish.
Merge conflicts.