Updated TODO
Change field_edit view into a class