Rework imports, add connecting