Refactored droplet code to own file, added conveniences