WIP on push and fetch