v0.6 - Final adjustment of relationships before unit testing begins