Much-delayed update from Bay12

This merge is gonna be a goddamned Doozy