A painful merge of #13.

Merged #13. LaunchSites is mostly in the middle of nowhere, but since it should go to a separate file eventually I didn't try to be smart.