Started adding timing control to server