Finished the switch-statement and changed a few things.