Added more details - still wip