Merge partner tagging

For branch: merge

Added tagging to models.

All Tests Pass