added Tinas' classes to the project