WIP: Adding join option