Minor fix in time module
Reminder
Adds bucket module, and some dependencies

Lots of refactor needed,
 both on code and unit tests.