Intermediate commit for some unfinished preset functionality....