Add debugging print statements to everything.
edit debug messages some more
Fix merge conflicts