I ran into an import loop...but I see I can bottom import and this works fine. I'll push the changes soon.