Filled in the classes that will be passed to the bots. Sundry other
changes. Maybe I should commit more frequently.