Work progres

Item 19