Update to non-vala version.

Not yet feature complete.