Introduced new solver that's not working yet...