Re organised some more. Still not working
Just before debugging