async refactor

[ShoGinn]

I think there is a massive movement of refactoring all the classes to an abstract base, and then you can use the base for the async/non-async portions rather than duplicating so much code.