Added first pass at Moebius switch-over