packing the 'testing' branch
public timer working