Replicating changes from v2 to v3 for once a day check. (related to #28)

Need to look at proper async stuff