Rework directional code. Remove debug messages (Hopeful)