Toscalib

Interim code checkpoint.
Updated to the suggested style of building the dict. Also found a couple of other places and made them consistent.