Con venus

DON'T MERGE

Temporary testing branch
If it is copy&paste and I suspect it is, we should remove it from OasisController and refactor code that is using it. Probably we don't want to maintain 2 the same solutions.