Feature/defining classes