Indev

all of the new features from index