Timezoom

resolved merge conflict
retested code.