This is going to be a fun bag of merge conflicts with the other pull...