Updates to user-stories
Add time function
Merge branch 'test'