Work in progress on unified CV