Tons of shit to bring things up to date