Implemented 3rd milestone

See merge request szofttech-ab-2023/group-04/csharks!39