Decouple still in progress
add the rethink time class