first working version
first working version
minor adjustments
finished working, refactor time