Still working on the CS, should finish tomorrow!