Making a bit more progress on menus and stuff