cleaning up debug statements, etc.
refactoring
still failing on dev data, but we're getting close.