Working on the grunt a bit, also trying to clean