added new menuing, some cleanup so things still compile