Implemented #4. Rewritten dictization functions.