Add dictionary

& first steps to highlighting