Work progres

Item 18