Modified linear solution methods to use self -I think this is right?