made some more progress on porting to go