initial contribution (with gen code - xcore TODO)