ghnc data added + Main a bit more done