Added solver and stuff....