Future major features

Heads up - improvements to tagging