Revert "Revert "Completed Timer feature""

This reverts commit b03c282c1024760c908841f40621c329fe9a4bcb.