added firebase and perfected add and remove logic