More class timers added, final commit for 0.4.6