Added StopWatch and StopWatch message.
Simplified build.