Updated Modular Design

More sophisticated data loading. Debugging the large datasets.
Currently does not load large datasets.