Added Time functions, doing initial testing