Performance improvements. Removed dumb stuff. Getting there.