More WIP on main lib