Add tags

It's been a while since I looked at this, but there are a lot of model changes in here.