Incremental update. Everything is still hilariously broken.