committing WIP
Updated remaining code for changes to dict