changed wdict to a nice class