adding timing
adding logging to see progress
merging master