Hy tek import

Bringing all the Hy-Tek import work so far into master.