Added and cleaned up inventory management.

Attempted to clean up user interfacing - didn't work.