Beginning of a complete overhaul.