Develop

I think I'm lost with the various merges - wasn't this method going to be removed?