Update on refactor progress
Updated ETA
Merge pull request #1 from nnnick/master

update from master