C 1&2 works, test and clean up