Working on updating more objective functions to work with the new parameter architecture.