Dev

Coded, tested, and reviewed by @thejamesdempsey @mattgasior @tdaffron