Proper inventory states and reduce inventory, closes #22