Almost done on 22, fixed most bugs