Fixed an import error that happened because of a refactor.  Stupid Pycharm did not show the error, so I didn't catch it before hand.