Con venus

DON'T MERGE

Temporary testing branch
This extension will be completely in CON-1382