Closes #29 inner joins. Fixes #74, fixes #75, removing joins.