WIP: Add calculation CAVV/AVV