Finished the correct way of switching cases