join, tests, and make merge betta
implement update