Porting more code to test the framework