Work progres

Item 17