Added mockup code for issue #7
Split date from time
Fixed merge