refactor add/remove time

Took off moment and replaced with date class
Merge branch 'refactor-addtime'