Indexes work, now code needs cleanup - does not build right now