Thread more promises through the adapter
Remove resolveOn

This makes async relationships nicer
Clean up promises stuff