Initial work on grunt integration