Rewrite some insane code to use async/await so it's readable again
Visual Studio Crap
Abuse NuGet to fix some failing Tests
Mock out Engine so more tests pass