Added goal, refactored for easier menuintegration. Deleted menu.