Mostly debugging changes, moved intial guess into constructor