Consolidated work from tagging-tool timeline-tags branch here. Work in progress on views.