Starting Feature/tag edit

Probably don't yet merge, too be tested and continued