They are adding a repair NPC you can place in your house in 2.2, and dresser/drawer-type items will have armoire functionality but I don't know if that was in 2.2 or not.