Multi index implementation added, some of it #if 0'd to allow compilation. Will complete tomorrow.