Much more polish
Added CRV calculator