Switch to forge api, for consistancy...

-dx