Ok, lets rename the methods here, and then I'll merge it, and we can do the collapse in a separate pull request.