Part way through porting stratum implementation