change some stuff to OSE

NEEDS MOAR WORK!