Services index

before merging this, make sure it does not need to be rebased as it goes on top of organizations index