Label promises after refactor

@machty can you please check if the labels are accurate?