First cut at AtomIndex with adding of (key, value)