Fix bugs and adding other 2 classes