added basic inventory functionality
added basic inventory functionality
merged