start to break out data url lookup
break out data url lookup
move all forms into dict
remove redundand del()s
Merge commit 'c0193' into generalise-importers