Working on some much-needed debug code.