Work progres

Item 16