Discussed with @lorenzo, and moved the behavior to Model/Behavior (which means this PR is now a 2-new-file change only)