More work, more rubbish commit messages