Merge branch 'debug' into working
Balanced out a lot of logger statements for future debugging.

Going to need it to implement Plan B.
Merge branch 'working' into debug