Asset stuff
Fixing bullshit merge problems