Use PreviousShot and NewShot data types
Remove unused JSON stuff and add new function