mini DIGMA 28

Almost final, small fixes will be done tomorrow.