Overhaul almost complete!