WIP introducing light client