Code

Simplified the way we handle tags. This *may* break tagging. Needs testing.