Basic reorg... added Enumerable and KeyedEnumerable