First steps in major overhaul.