Wbiesing/ray genomix refactor