Start major overhaul [ci skip]