Updated to use a dictionary

There is now a dictionary YAY! :) should be fast