Further progress. Just saving, generating and polishing to do.