Overhaul Non-Conference scheduling ASAP