Initial test structure, start porting