Work in progress, adding time and unit support