Begin porting transactions current cl
Fix bugs and lint