First commit, adding editor functionality