Work in progress on edit