Moving out of grunt context