progress on Controller rewriting