Modifying sec-versioning to handle associations
Merging and tracking changes
Merging in some changes