major refactor
updates for tags