Implement completed basic partnering feature