generalise form selection
move lookup table away from logic
split import function in two
remove a bit more repetition
manual merge
Merge commit '7db5' into generalise-importers