WIP
Simple
Updates
WIP
Async
Callbacks in place
Clean ups