[WIP] Separate pull from Server
[WIP] Separate push from Server