This commit also introduces a better grouping of data points.
This commit also improves how data is loaded sync and async