Working on grunt setup
More grunt setup