don't delete keys when parsing values
refactor update module structure
first dirty pass at nested updates