Starting work on a Black volatility surface calculator for equity future options and moving commodity forward curves into the correct package