Adds REST for controller and some clean-up