New timescale logic and implementation working.