Interim commit of work on new tags API