WIP: Migration to cap3