Close.  One bug at a time.  Maybe this will be the clean build I long for...