Almost done with util.ts, using correct type names