clean up indexes a bit
start decoupling stories from services

as I think this will change