Work progres

Item 40