Added more CRUD features,  refractored more code