sort out data loading and upset
make more configurable