Rebased stupid commits and force-pushed to github.

Nasty.