Added rudimentary label selection for #18