Workshop tasks done

Maybe some refactoring is still needed