Now self-contained (i.e. all libraries packaged)