Fix a bug
Add todo about querying api for status.
Add TODOs.
Merge latest upstream.
Commit wip