Implementing some other classes, having a functional sample without to much logic. Also added some other fixes and improvements