Moves benchmark to stopwatch, better error handling, benchmarking for whole process included