Work progres

Item 34