This should keep asset associations

So we hopefully don't have to keep reattaching all the things.