After some more work...