Implementing remapping (Work in progress)
Time API unittest (Work in progress)
Implement time API