index added

plus code from other branches was deleted from this branch