Renamed relationship marco, now works with @ and changed to 3/4 arg verisons