More work on tags. Still missing important stuff.