Breaking stuff more, trying to add menus

Mouse broken. Use a different commit.