Got the import to work, but there are some tweaks needed