I agree with most of your suggestions except having CCTV's at the warehouse, I mean we're supposed to let gangs do their RP aswell and not stay on them 24/7 without a bit of oppurtunities to RP drug deals and such. Keeping the lockers and warehouse without CCTV's seems fair for me.