Interrim commit, time controls now supported, but clock times have to be reported and fixed