WIP integrate history with client