rearranged everything; basic tests pass