working on relations and merging back to master