All of the recent changes that make the edit button almost work
DO NOT MERGE THIS ONE: IT IS A REFERENCE