Put in states removed timeRemaining and put totalTime, calculations utilizing totalTime and currentTime now.