controller: Move the while loop to the parent
controller: Move the while loop to the parent

Not quite correct, but some way there. Re-indent the code as a
consequence.

SimonKagstrom/coincident,SimonKagstrom/coincident