Interim commit while working on the function editor