API work and grunt improvements.