WIP - add tags

Still need tests and to be able to delete them