Started work on OWF7 compatability