Fix opme and move to a more appropriate location...