Feature/foreign ou2

Build on the nice Feature/foreign_ou branch with some tweaks