Trying to fix

Branching into Wisper/Secret Layout after this commit.