finally managed to get 1-many JOIN sets abstracted

could use some refining
this is what I get for not testing changes