Start of converting to use gyp