Add in inventory
Fix inheritance