real beginnings of grunt restructuring (after some mishaps)