Work progres

Item 22