Dev

First draft on join (-j) feature, minimal tests added