WIP Update libs, integration and add unit tests