Partner rails

Rebase to develop