Adding grunt watch and redoing the event system