Some MORE debug stuff gone
Moving stuff around