Half-way commit. Still not working.