New Data Model

To keep up with what stage of the shot they are on