Started adding editor templates and validations