Initial work on inventory editing
More work on inventory
Some stuff works, some stuff doesn't
Name lookups fixed partially
Synced with Latest Commit (Name lookups fixed partially)