Adding in more C4 work

Updates to C4 and E4