Work progres

Item 23