Move finn_bok feature from @wip