Firebase working.  Refactoring so no refresh needed.