Might get funny mixing second comparison with timestamps. Should at least ensure if we're specifying a point in time we use a timestamp (millis since epoch), but if we're specifying a duration of time it could be seconds. Will make the code a little more complex but might be easier to configure ? Fixed.