Sortof merge of master branch. One day I'll get the hang of this.