Added 2 classes with winnikka. Fully up to date.