merged kevin's code with mine

added a bunch of new stuff including firebase integration