Work in progress

Working on getting mocking again with the scope isolation.  Got my original failing test working, but broke a crapload of other stuff.  Checking in so I can work on it from another computer later.