Separate keys

Reissuing pull request with string compares fixed up.