Tags final

Added a new branch due to problems merging my old one. This is otherwise a duplicate of my previous final tags proposal.