M68 dev - infrastructure ready