Work progres

Item 24