continued work on porting files over