Updated switch menu logic, still commented out.