added timers, finished toolkit migration