got the keys
fixes merge conflict
adds some tests and other ideas