Initial Vio Extended commit as per released version on rewrite.pw