Incomplete (and probably not running) changes to get Spencer started.