Working dictionary and fixed class errors.