Trying to refactor passport so two instances can run at once...

-Dx