big nasty commit with tons of shit