first pass at adding labels