all the changes in one big commit because @AdamWhittingham would love this.
dirty ol merge