More things to do.
Extract code into separate Controller class; Handle errors.
Scratch one from the TODO list.