Trying a second PR

Unsure why we can't just add to the first one with more commits. Maybe a branching thing.