c3s2 mostly done
Finish c3s2
Last few bits on c3s2