Final last commit today...
Added a few more things to debug....