updating everything to work with firebase