Changes to ovetall structure, started book2