Eventually we'll need this in the 3.5 and SL projects, but good start.