Reorganized for rapid testing

Connor