Updated C code commit, moving on to CSharp