Update current functionality to meet the new draft AV calculator.

This PR updates the functionality to match the 2016 draft calculator and solve #5.