When are Engines 2,3, and 4 getting restocked?

Here's my list of possible products in the future.

HO Scale
Whiff (with moving eyes)
Breakdown Train
Rocky
Sidney (with moving eyes)
NER vans

Narrow Gauge
Duncan
Slab Wagons

N Scale
Edward
Toad
Tar Tanker
Sodor Fuel Tanker

Large Scale
Saxa van
CCT van

Scenery
The Chocolate Factory
Maron Station
The Railway Works
Dryaw Goods Station

Accessories
Sodor Inn
Neptune Refreshments
Knapford Bus Yard

With Bachmann discontinuing building releases like Tidmouth Sheds and Maithwaite what will you release next? I recommend the Shipping Company warehouse, the Watermill, Mccoll's Barn and Mr. Jolly's Chocolate factory. I worried about the discontinue aspect.