Finalizing the first pass at relationships