Dreadful commit messages, trying to chunk into smaller commits..