(Griffin) Flesh out Griffin some more for regular PC-style builds