Knocked off a few TODOs since the way relationships are updated is ironed out.