query and add epoch WIP , see trello epcoch issue for  details