[@josephb]
Finished Kat's CS