Should this be an object rather than an array?