Added the start of the inventory subsystem
Merge branch 'ferrybig'