Working on editor functionality