Capx 80

CAPX-24 & CAPX-80... ready for review.