Updated rest of the code to use the new relationship()s.