WIP on lib & docs