Work progres

Item 36