added Daniels persistence code & started validation on 12