bunch more old stuff copied over