More progress on the Area system.