Work in progress: import of datapoints, needs refactoring