Fleshed out the grunt draft