Add & Edit preliminary functionalities done