Started on Dictionary support, building it up step-by-step