yay, some more work