Rewrote the data storing, now using a ComponentContainer Class