Changes to few classes, soon first tests