Quickly added untested Baubles support. Will test out when I have more time