first stab at adding labels, incomplete