Lots of updates to Java codebase. Menus in progress.