this is very much in progress, but at least the branch importing works a little bit