Began to implement editor functionality