first crack and porting stuff over and adding new plugins