Made better use of the switch statement

[fearphage]

The current switch implementation was functioning similar to a list of if-else statements. This takes full advantage of the structure.

I tried running tests, but ran into 2 issues:

1. The tests (if they exist) are not checked in.
2. jest is not installed in the dev dependencies to even run the tests.

I ran the other things I have access to which is lint and it was happy.