End of Friday. Lots of Controller action untangling to come