WIP: updating models for dataset/slot changes

incomplete, broken