About to add some front end tests
Fixed switch statement
Committing a bunch of little changes