Working addComp and addLab now