updated time and estimate stuff
clean up testing before hand off
Merge pull request #13 from EldonYoder/testing

Testing