added add and rem buttons (not yet working)