Reworked how things were done for the grunt jobs