label test commit
implementation of labels and api cleanup code
forgot to include these files.