Drone refactor

Merging #649