Added actual add and remove handlers to hb-with=collection stuf