model and relationship setup done
Merge branch 'nixwork2'