Continued updates to inventory

Coming along nicely, still not fully set up...working out a few minor
bugs/issues