Renamed fields of Container to their plurals since that makes more sense.
First attempt at refactoring the generic 1-HIT stuff.