Accurate end timing refactoring complete.

Refs #120