Many changes, also installed Grunt