etresource.ts and wpsresource.ts almost done