Grunt updates and server side work