Dramatic changes

Reanalyzed how data is encapsulated. Works the same as before, perhaps
more efficient.