Made some strides on lining up junctions/n..m stuff w/ waterline-schema