Draft: Finish move (miroil part 5)

WIP, I may split this up into more pr, but i put it up here for some initial reviews

Do not merge before !40

Co-authored-by: Erlend me@erlend.io