Work progres

Item 37