Started populating the switch statements in draw