Moved around some methods, inheritance. Started on AWT menus.