started restructuring paper, haven't merged w old stuff yet.