finished switch stuff
Merge pull request #55 from natalie03/master

finished switch stuff