Looks like everything is working now. All that's left is cleanup,
hopefully.