Work progres

Item 28