Comment 12 for bug 1350042

I committed the bulk of this, but did not include Mike's last commit because I hadn't tested that far yet. Marking this bug as mostly fix committed, but we need to get some eyes on that final commit before we push it.