Changed Edit.Controlle as a Class and implemented