Added and finished editor feature