interim check in for message refactoring.
Interim commit for timer.