Not really spoilery...
I watched the first two episodes of Agent Carter and - while I loved them both - there was something that didn't *quite* compute. Peggy's still competent as all get out, but she seems a bit less... sure of herself, maybe, when it comes to espionage than what we saw in the Agent Carter short and she's not in charge of anything. Hence, I suspect the series is set before the one shot.
The speculation? The endgame for this season is Peggy getting more comfortable as a peacetime spy and clearing Howard Stark's name. Season ends with a cleared Howard and the events of the one shot - the founding of SHIELD and Peggy's promotion after one of the best job exits EVER.






