InvGen almost done