Last commit before implementing editor framework