More work on publishable lib, merged collaborable with publishable