Finish up dropins changes
Merge pull request #2 from jkat98/dropins

Finish up dropins changes