start to break out data url lookup
break out data url lookup
move all forms into dict
remove redundand del()s
enclose work in functions
remove debugging lines
manual merge
manual merge
manual merge
Merge commit '417c' into try-merge-latest-import-code