almost done for now