Starting a rebuild to tick Vendan off