done for now
almost done