Added decoder map to cut down on logic to print results.
Added convert to token type ability to output.