A bit more SL porting work... next step is dependencies