Got basic set selection working again; a few GUI additions