Dev snapshot - some additional porting.