add todo: keys that have quotes around them