V1.0 - edit and delete working