Issue 42 switch statement

[Isaac-Saleh]

I used a key value pair dictionary as a make shift switch statement to clean up the multiple if statements sitting on top of one another.