Further work on annotate samples, still have to decide final format for label files