some more progress, copy and paste from omegacomplete1