More updates. Delete functionality half working