Revert "adding back in shotnumber changes and data_contexts"

This reverts commit 59f5dce61c6ceda533099e33e4d47a3d612203f8.
Revert "Revert "adding back in shotnumber changes and data_contexts""

This reverts commit 70049bcde8287a7ac350479212026c923c0d1ecb.