WIP Feature/tagging sensibly squashed