Whitespace destroyed.
Remove TODO.
Fix delay function to propagate correctly.
Change naming to make clearer.