Move things around.
Initial rewrite to include predicate support.
Fix reference.
Bump version.