added new task
first level of class extraction
extracted stuff into tiny classes