Removing some keys we won't use
Naive implementation for which stats to gather.
Re-organized structure and component creation.