Yep need to refactor the conduit part