Finish dataset, demo tweaks, stop working on this