Working towards condition support - needs rethinking