Added start of edit/filter code