Controller up to summer final comp.

Only <del>54</del> 58 commits.