Get everything merged and updated up to std::function