added stopwatch adapter
renamed almost everything