Fixed many of the issues caused by the vNext migration
Converted many of the missing methods to use the async versions
Finished getting everything running for vNext