First pass, implemented index listing