Shotgun refactor

Shotgun parameters changed, added some TODOs