Major code overhaul.