Move dataset around
Start to add some more metrics