Pilots

This fixes both #15 and #42.