More progress will be coming. Trying to finish this one quick.