WIP on integrating server data