[WIP] Activated Joins and added functional test

This PR activates the join functionality and poses some questions. DO NOT MERGE YET!! :)