FEATURE: interim checkin
FEATURE: More incremental development.