WIP milestone1, tighten up some Labels-related stuff in prep for CrossValidate + friends