Messing a bit with relationships, hopefully now when required stuff fails, downstream stuff will be skipped properly.
The dollar sign makes for a much prettier port. Like, one without a variable name in it.