A total wreck just in case I go crazy

Removing a switch statement that was a bad design. This has a more
complete look.