Added two timers, A/B
Added some missing files