Some time handling work

Not finished or working!
Now working