Support still doesn't work, but here's some more code