WIP multi-invocation
No longer panics, tests passing