More stuff. Sorry for the rubbish commit messages