(#36) - selects are now key, value