WIP on main lib
WIP on demo app