refactored hjm for bonds
refactored hjm for cap -missing IV and surface