2 first points done

More or less half of the procjest done