Add more functions to optimize. Do a 2D notebook.