Remove TODOs, track via issues.
Added missing import of time library for access to sleep()