Last main menu commit, I promise