Work underway for dictionary class