Refactor objects

I hope I haven't broken anything. Anyone wish to confirm this?
Not sure about this, how else would the number of items be the correct value?