Adding stepping timer.
Merge fuckery