Partial work on porting more features