Update package.json
Update base.make
Added test...