Work progres

Item 33