Added basic index
Fixed conflicts and added member addition ability
Fixed further conflicts due to Git error
Fixed further conflicts due to Git errors