Con venus

DON'T MERGE

Temporary testing branch
It's old code, it will be rewritten on CON-1383