http://users.puzzling.org/users/mary/bzr/planet/branches/main-tests/ is a branch of Jeff's trunk that splits up the planet.py main into somewhat testable units. It should (after some effort on my part) merge cleanly. -Mary