Command invocation now returns separate wrappers. Resolves #1