added labels, almost finished