Rework editing to include messages