Daniel. Have completed tentative time functionality