Comment 6 for bug 999574

I'm splitting this bug into many smaller bugs, because it is a *huge* chunk of work to get all of this together.

So far the split out bugs are:
bug #1006870
bug #1006872
bug #1006876
bug #1006879
bug #1006882
bug #1006889