More WIP on main lib
More WIP on demo app