Removed ipopt stuff
Initial matching code