more work into menu, mostly finished, needs refactoring