Working on porting overall architecture