Finished porting major classes