A new PR that will hopefully just incorporate changes by @kdesoto-psu, and not re-duplicate other branch history.
MPoL-dev
