add all almost done