And modifying the csprog file...

Sorry about that. Hopefully no merge issues...