Move weight to base entity, begin work on Inventory