Move to using an array of objects rather than primatives. Closed #19