Partially port e-utils to WK2 (still some code is commented out)