Started work on proper indexing.