Changes

I'll push commits as I go through your PR. Don't merge yet :)