Added delete/new support

Started work on tags