Work progres

Item 27