Handle *args and **kwargs

[long-m-r]

While this may partially work at present, I've had mixed success in current testing. Seems like there is a lot more to do here to make it robust.