More curry

As per #67, I think this will cover a good bit.