Slightly better architecture around crane.connect