merged with nav branch
Added OXY Classes