Halfway through the with the implementation of the grouped table. Reconsidering to change to "flat" table