Switch to AsyncTask instead of Thread, add some TODOs