Work progres

Item 39