I have no idea how safe this PR is.

I tested everything but... ehhh notable inventories still don't work, and I'm not proud of that