Working on Async stuff still
Merged origin with master