Working on merge from my code for PROS into new ConVEX project.