More Streamlining and added stopwatch functionality