Comment 2 for bug 225748

I've been working on this, and it's becoming a bigger issue than can be completed in a week. I'm going to push this out, and start working on a blueprint for it. There are some other changes that should be added along with this, so I think it's probably a good idea to implement in this same branch.