I - Integrate initial files from v.012