Moving from arrays to objects for order representation

(Prep for unit testing dependency injection)