Added dummy data generator.
Updated to use generated dummy data.
Refactored for readability