WIP search + added financial arrangements enum