Work progres

Item 31