updated to no longer handle hour and minute, but to handle hashes