starting to refractor, pushing for peer review