using the c app now, and better structure