Work progres

Item 29