huge rehaul of pretty much everything