Partest PR up to the passing commit.

Rebased and dropped the failer in the hopes of merging this.