About to change a lot of code in the c api