Work progres

Item 21