Adding in solving components