Started adding manualJoin functionality