Still needs clean up, but lots of progress on in-profile edits