Improving data structure, adding helper methods. Preparing to calculate trends