Overhaul classes and multi-handling

[mikeabdullah]

Went through and had a big ol' cleanup of both classnames and how we handle multi transfers. Still passes all unit tests; I'm pretty happy!