Infinitives!

Fixes #18