More EB Core porting, still not touched networking