-end to end working , firebase data layer needs to be re-worked