Sure-- I'll switch to that. Was starting to implement what I'd done elsewhere-- ie inject a "TimeSource" object but for consistency I'll mirror what you've done there