Huge refactor, mostly of the Service.  Broke Predictor at the very least.  Need a break before continuing to clean, reorganize, and fix what I broke.