Added misc editor + added todo's