Started adding conduit code