Removed some debuggig - more to go.