Initial passport integration. need much more tweak