Update #61 and start implement controller.