Updated shotgun command for dev environment
Updated TODOs