Progress report. Mostly cleanup from here on out.