Change class name
Add comments
Start structuring the menu functions