remove old time function
refactor polling / progress checking