Add leftJoin

Rebased ontop of latest develop