Merged With Maria's Main Menu Code

Must test for bugs.