[DON'T MERGE] perty.next

Needs squashing
:rocket: :microscope: