Began converting switch statement to Dictionary for speed

Waiting to get on a computer where I can test this before finishing implementing it.