Finish tagging, some nice refactoring of partials