Started working on team editor