This, obviously, can be discarded for this PR. I didn't realize it had come across from another branch i was working on.