Almost done with the CS, just prettying it up.