feedback from SCW, and start on a bit of reorganization
some reorganization
import some feedback/questions from defense