some generic code written
Merge pull request #15 from KristaANelson/refactor_time

some generic code written