Adding recent changes to messing_with_firebase