redacted several classes, stepping project back a few steps