CE eq classes 3 and 4 added. Skeleton for 1 and 2.