Code organization; testing more keys
Code organization