Command menu closer to working