most recent version - edit and delete functions still to be fully actioned