duct 2019-12-07

Oops, found I'm doing too much in one namespace. Once that's broken up should load faster