updating inventory mainframe
I think I merged this correctly