Reverted back. Added Stopwatch.js back in. Some minor refactoring.