More work
I swear that sooner or later I'll start using sane commit messages :)