streamlined

still not building