Did a bit more on porting the old code into the new language