Yep, this is coming. As soon as I finish the local database so that we can store that information locally