Revert "Revert "Fix starring to always happen""

This reverts commit ac2a55a2b4b0ab3412198a3dc74ca533e5ac6b74.
Revert "Use async"

This reverts commit f0a254d7669ed0ab232d7fa011aaf40cc978f1fb.