@jmoiron Is there a better way to do this? Seems like a nightmare for pull requests.