Added edit support
Controller working!