Initial commit on master
First working version with nice TimeUnit conversion
Some tidy up