Adding TODOs for self
Movd to async retry
Moved to forced delay for screencasts. Now everything is more/less consistent. Finally.