Moved stuff over from Boutique.git in Asonix and Posixoddity