Version two

Added dictionary versus class (speed)