All usercases done except 2, not yet working properly

Co-authored-by: Øystein Martinussen <oystmar@users.noreply.github.com>