solver initial commit