uber upgrade. Very close now. Major debugging