Changes to solver. Merging now