Refactoring the around a more generalized framework. Removed data loading upfront - now data is inlined instead