WIP: change optimizer classes