Added data loading and date, parsing, shape generators