moved everything into scope.model for easier watch hacking
moved everything into scope.model for easier watch hacking