Added some time capabilities
Updated simple time stamps