Most of the 1.2 C client done