massive overhaul that will probably break