Gettin' edumacated.

Added Dictionary types, rather than double arrays, hopefully fixing the
0-column errors