Adding in support for secondary account.
Adding back in the Yegge
Correcting environment for BK